Revert "ScrolledWindow—Don’t req size for auto-hidden bars"

This reverts commit 901e5ff3a36b74b8ae4c19f4f20e84bc70b44913.

This causes criticals in e.g. the Text View: Multiple Buffers demo.
More work is required to get a fix for Bug 778853 that does not cause
anything else to regress.

https://bugzilla.gnome.org/show_bug.cgi?id=778853

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 238f1dcf541b10ad32927a1967b387026eec31fe..b51875c95cd9fc32c8cebd42827f63e016826751 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1784,7 +1784,7 @@ gtk_scrolled_window_measure (GtkCssGadget   *gadget,
    * Now add to the requisition any additional space for surrounding scrollbars
    * and the special scrollable border.
    */
-  if (priv->hscrollbar_policy == GTK_POLICY_ALWAYS)
+  if (policy_may_be_visible (priv->hscrollbar_policy))
     {
       minimum_req.width = MAX (minimum_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
       natural_req.width = MAX (natural_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
@@ -1796,7 +1796,7 @@ gtk_scrolled_window_measure (GtkCssGadget   *gadget,
        }
     }
 
-  if (priv->vscrollbar_policy == GTK_POLICY_ALWAYS)
+  if (policy_may_be_visible (priv->vscrollbar_policy))
     {
       minimum_req.height = MAX (minimum_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);
       natural_req.height = MAX (natural_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);